Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Wed, 5 Apr 2017 12:28:33 +0000 (08:28 -0400)
committerTom Rini <[email protected]>
Wed, 5 Apr 2017 12:28:33 +0000 (08:28 -0400)

Trivial merge